From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 18 Feb 2013 04:08:41 +0000 (-0500)
Subject: appDisplay: remove unused parameter to AppWellIcon constructor
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4770
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6bb38b873b80563fc2626e5431094ce758fb1ad4;p=gnome-shell.git

appDisplay: remove unused parameter to AppWellIcon constructor

https://bugzilla.gnome.org/show_bug.cgi?id=686984
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c3cd38260..5cd15722f 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -386,7 +386,7 @@ const AppIcon = new Lang.Class({
 const AppWellIcon = new Lang.Class({
     Name: 'AppWellIcon',
 
-    _init : function(app, iconParams, onActivateOverride) {
+    _init : function(app, iconParams) {
         this.app = app;
         this.actor = new St.Button({ style_class: 'app-well-app',
                                      reactive: true,
@@ -401,8 +401,6 @@ const AppWellIcon = new Lang.Class({
 
         this.actor.label_actor = this.icon.label;
 
-        // A function callback to override the default "app.activate()"; used by preferences
-        this._onActivateOverride = onActivateOverride;
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
         this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
@@ -539,16 +537,13 @@ const AppWellIcon = new Lang.Class({
         this.emit('launching');
         let modifiers = event.get_state();
 
-        if (this._onActivateOverride) {
-            this._onActivateOverride(event);
+        if (modifiers & Clutter.ModifierType.CONTROL_MASK
+            && this.app.state == Shell.AppState.RUNNING) {
+            this.app.open_new_window(-1);
         } else {
-            if (modifiers & Clutter.ModifierType.CONTROL_MASK
-                && this.app.state == Shell.AppState.RUNNING) {
-                this.app.open_new_window(-1);
-            } else {
-                this.app.activate();
-            }
+            this.app.activate();
         }
+
         Main.overview.hide();
     },